From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 2 Jun 2015 18:40:55 +0000 (+0100)
Subject: resourceloader: Remove redundant getModifiedTime implementations
X-Git-Tag: 1.31.0-rc.0~11176^2
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=64ecc774229666eedd3e4739afaefaf97b1cfa4c;p=lhc%2Fweb%2Fwiklou.git

resourceloader: Remove redundant getModifiedTime implementations

Follows-up f37cee996e which replaced the getHashMtime() and
getDefinitionMtime() methods with dummies that always return 1.

These getModifiedTime() implementations were only tracking the
definition summary or custom hash, which is already tracked
by getVersionHash().

Notes:
* SpecialCharacterDataModule: This one was odd as it was tracking
  both the mtime *and* the file contents.

* UserCSSPrefsModule/UserOptionsModule: Remove redundant caching.
  Already taken care of by getVersionHash() as of f37cee996e.

Bug: T94074
Change-Id: I6e37c3c2f85ef4599a8643b0efabc18de2f51ec4
---

diff --git a/includes/resourceloader/ResourceLoaderImageModule.php b/includes/resourceloader/ResourceLoaderImageModule.php
index f695b1118f..eb06a6959a 100644
--- a/includes/resourceloader/ResourceLoaderImageModule.php
+++ b/includes/resourceloader/ResourceLoaderImageModule.php
@@ -409,10 +409,7 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 		$files = array_values( array_unique( $files ) );
 		$filesMtime = max( array_map( array( __CLASS__, 'safeFilemtime' ), $files ) );
 
-		return max(
-			$filesMtime,
-			$this->getDefinitionMtime( $context )
-		);
+		return $filesMtime;
 	}
 
 	/**
diff --git a/includes/resourceloader/ResourceLoaderLanguageDataModule.php b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
index 123945365d..ebaf366ee8 100644
--- a/includes/resourceloader/ResourceLoaderLanguageDataModule.php
+++ b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
@@ -62,14 +62,6 @@ class ResourceLoaderLanguageDataModule extends ResourceLoaderModule {
 		);
 	}
 
-	/**
-	 * @param ResourceLoaderContext $context
-	 * @return int UNIX timestamp
-	 */
-	public function getModifiedTime( ResourceLoaderContext $context ) {
-		return max( 1, $this->getHashMtime( $context ) );
-	}
-
 	/**
 	 * @param ResourceLoaderContext $context
 	 * @return string Hash
diff --git a/includes/resourceloader/ResourceLoaderLanguageNamesModule.php b/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
index 55b1f4b14d..31110507c9 100644
--- a/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
+++ b/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
@@ -64,14 +64,6 @@ class ResourceLoaderLanguageNamesModule extends ResourceLoaderModule {
 		return array( 'mediawiki.language.init' );
 	}
 
-	/**
-	 * @param ResourceLoaderContext $context
-	 * @return int UNIX timestamp
-	 */
-	public function getModifiedTime( ResourceLoaderContext $context ) {
-		return max( 1, $this->getHashMtime( $context ) );
-	}
-
 	/**
 	 * @param ResourceLoaderContext $context
 	 * @return string Hash
diff --git a/includes/resourceloader/ResourceLoaderSkinModule.php b/includes/resourceloader/ResourceLoaderSkinModule.php
index 3ba63e6822..980b7fed1e 100644
--- a/includes/resourceloader/ResourceLoaderSkinModule.php
+++ b/includes/resourceloader/ResourceLoaderSkinModule.php
@@ -71,15 +71,6 @@ class ResourceLoaderSkinModule extends ResourceLoaderFileModule {
 		return false;
 	}
 
-	/**
-	 * @param $context ResourceLoaderContext
-	 * @return int|mixed
-	 */
-	public function getModifiedTime( ResourceLoaderContext $context ) {
-		$parentMTime = parent::getModifiedTime( $context );
-		return max( $parentMTime, $this->getHashMtime( $context ) );
-	}
-
 	/**
 	 * @param $context ResourceLoaderContext
 	 * @return string: Hash
diff --git a/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php b/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
index bbc59aca69..5eb4e3ad7e 100644
--- a/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
+++ b/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
@@ -53,14 +53,6 @@ class ResourceLoaderSpecialCharacterDataModule extends ResourceLoaderModule {
 		);
 	}
 
-	/**
-	 * @param ResourceLoaderContext $context
-	 * @return int UNIX timestamp
-	 */
-	public function getModifiedTime( ResourceLoaderContext $context ) {
-		return static::safeFilemtime( $this->path );
-	}
-
 	/**
 	 * @param ResourceLoaderContext $context
 	 * @return string Hash
diff --git a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
index 472ceb26e9..d0f7d4476b 100644
--- a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
@@ -27,25 +27,14 @@
  */
 class ResourceLoaderUserCSSPrefsModule extends ResourceLoaderModule {
 
-	/* Protected Members */
-
-	protected $modifiedTime = array();
-
 	protected $origin = self::ORIGIN_CORE_INDIVIDUAL;
 
-	/* Methods */
-
 	/**
 	 * @param ResourceLoaderContext $context
 	 * @return array|int|mixed
 	 */
 	public function getModifiedTime( ResourceLoaderContext $context ) {
-		$hash = $context->getHash();
-		if ( !isset( $this->modifiedTime[$hash] ) ) {
-			$this->modifiedTime[$hash] = wfTimestamp( TS_UNIX, $context->getUserObj()->getTouched() );
-		}
-
-		return $this->modifiedTime[$hash];
+		return wfTimestamp( TS_UNIX, $context->getUserObj()->getTouched() );
 	}
 
 	/**
diff --git a/includes/resourceloader/ResourceLoaderUserDefaultsModule.php b/includes/resourceloader/ResourceLoaderUserDefaultsModule.php
index 5f4bc16b5e..2fd35adcd1 100644
--- a/includes/resourceloader/ResourceLoaderUserDefaultsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserDefaultsModule.php
@@ -40,14 +40,6 @@ class ResourceLoaderUserDefaultsModule extends ResourceLoaderModule {
 		return md5( serialize( User::getDefaultOptions() ) );
 	}
 
-	/**
-	 * @param ResourceLoaderContext $context
-	 * @return int
-	 */
-	public function getModifiedTime( ResourceLoaderContext $context ) {
-		return $this->getHashMtime( $context );
-	}
-
 	/**
 	 * @param ResourceLoaderContext $context
 	 * @return string
diff --git a/includes/resourceloader/ResourceLoaderUserOptionsModule.php b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
index 84c1906d2d..4ed1b876a0 100644
--- a/includes/resourceloader/ResourceLoaderUserOptionsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
@@ -27,16 +27,10 @@
  */
 class ResourceLoaderUserOptionsModule extends ResourceLoaderModule {
 
-	/* Protected Members */
-
-	protected $modifiedTime = array();
-
 	protected $origin = self::ORIGIN_CORE_INDIVIDUAL;
 
 	protected $targets = array( 'desktop', 'mobile' );
 
-	/* Methods */
-
 	/**
 	 * @return array List of module names as strings
 	 */
@@ -49,12 +43,7 @@ class ResourceLoaderUserOptionsModule extends ResourceLoaderModule {
 	 * @return int
 	 */
 	public function getModifiedTime( ResourceLoaderContext $context ) {
-		$hash = $context->getHash();
-		if ( !isset( $this->modifiedTime[$hash] ) ) {
-			$this->modifiedTime[$hash] = wfTimestamp( TS_UNIX, $context->getUserObj()->getTouched() );
-		}
-
-		return $this->modifiedTime[$hash];
+		return wfTimestamp( TS_UNIX, $context->getUserObj()->getTouched() );
 	}
 
 	/**
diff --git a/includes/resourceloader/ResourceLoaderWikiModule.php b/includes/resourceloader/ResourceLoaderWikiModule.php
index 74ad774884..86d59a14aa 100644
--- a/includes/resourceloader/ResourceLoaderWikiModule.php
+++ b/includes/resourceloader/ResourceLoaderWikiModule.php
@@ -229,8 +229,7 @@ class ResourceLoaderWikiModule extends ResourceLoaderModule {
 		}
 		$modifiedTime = max(
 			$modifiedTime,
-			$this->getMsgBlobMtime( $context->getLanguage() ),
-			$this->getDefinitionMtime( $context )
+			$this->getMsgBlobMtime( $context->getLanguage() )
 		);
 		return $modifiedTime;
 	}